From: Kenichi Handa Date: Wed, 29 Sep 2010 00:52:03 +0000 (+0900) Subject: xfont.c (xfont_open): Fix setting of font->average_width from :avgwidth property... X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~18^2~16^2~49 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=76be347ed50006ec95585d0c1eb0cc30e6eb08f2;p=emacs.git xfont.c (xfont_open): Fix setting of font->average_width from :avgwidth property (Bug#7123). --- diff --git a/src/ChangeLog b/src/ChangeLog index 3adcd9d7a4d..6c6679abf49 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-09-29 Kenichi Handa + + * xfont.c (xfont_open): Fix setting of font->average_width from + :avgwidth property (Bug#7123). + 2010-09-26 Jan Djärv * xgselect.c (xg_select): Clear file descriptors not set from diff --git a/src/xfont.c b/src/xfont.c index d8fe40eaa93..a676cd29c82 100644 --- a/src/xfont.c +++ b/src/xfont.c @@ -861,7 +861,7 @@ xfont_open (f, entity, pixel_size) val = Ffont_get (font_object, QCavgwidth); if (INTEGERP (val)) - font->average_width = XINT (val); + font->average_width = XINT (val) / 10; if (font->average_width < 0) font->average_width = - font->average_width; if (font->average_width == 0